Merge branch 'self-custody'

1 files changed, 9 insertions, 2 deletions

diff --git a/src/routes/(app)/[username]/+layout.server.ts b/src/routes/(app)/[username]/+layout.server.ts
index 11e6d45c..9a520036 100644
--- a/src/routes/(app)/[username]/+layout.server.ts
+++ b/src/routes/(app)/[username]/+layout.server.ts
@@ -1,17 +1,24 @@
 import { get } from "$lib/utils";
 import { error } from "@sveltejs/kit";
 
-export let load = async ({ cookies, depends, params: { username } }) => {
+export let load = async ({
+  cookies,
+  depends,
+  params: { username },
+  parent,
+}) => {
   depends("app:user");
 
   try {
     let subject = await get(`/users/${username}`);
+    let { user } = await parent();
+    if (!user) user = subject;
 
     let expires = new Date();
     expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60);
     cookies.set("username", username, { path: "/", expires });
 
-    return { subject };
+    return { subject, user };
   } catch (e) {
     error(500, "Unable to retrieve user account data");
   }